Don't pass on GDK_ACTION_DEFAULT. The Xdnd code passes zero instead, so do

2001-06-13  Alexander Larsson  <alla@lysator.liu.se>

	* gdk/linux-fb/gdkdnd-fb.c (gdk_drag_status):
	Don't pass on GDK_ACTION_DEFAULT. The Xdnd code
	passes zero instead, so do we.

diff --git a/ChangeLog b/ChangeLog
index 11e94bec006a654d9fc28a5750b884b16a18fb7c..36ffab358bdbf5d1098911fafd7dd363d4f59302 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-13  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gdk/linux-fb/gdkdnd-fb.c (gdk_drag_status):
+       Don't pass on GDK_ACTION_DEFAULT. The Xdnd code
+       passes zero instead, so do we.
+       
 2001-06-13  Alexander Larsson  <alla@lysator.liu.se>
 
        * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy):

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 11e94bec006a654d9fc28a5750b884b16a18fb7c..36ffab358bdbf5d1098911fafd7dd363d4f59302 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-06-13  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gdk/linux-fb/gdkdnd-fb.c (gdk_drag_status):
+       Don't pass on GDK_ACTION_DEFAULT. The Xdnd code
+       passes zero instead, so do we.
+       
 2001-06-13  Alexander Larsson  <alla@lysator.liu.se>
 
        * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 11e94bec006a654d9fc28a5750b884b16a18fb7c..36ffab358bdbf5d1098911fafd7dd363d4f59302 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-06-13  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gdk/linux-fb/gdkdnd-fb.c (gdk_drag_status):
+       Don't pass on GDK_ACTION_DEFAULT. The Xdnd code
+       passes zero instead, so do we.
+       
 2001-06-13  Alexander Larsson  <alla@lysator.liu.se>
 
        * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 11e94bec006a654d9fc28a5750b884b16a18fb7c..36ffab358bdbf5d1098911fafd7dd363d4f59302 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-06-13  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gdk/linux-fb/gdkdnd-fb.c (gdk_drag_status):
+       Don't pass on GDK_ACTION_DEFAULT. The Xdnd code
+       passes zero instead, so do we.
+       
 2001-06-13  Alexander Larsson  <alla@lysator.liu.se>
 
        * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 11e94bec006a654d9fc28a5750b884b16a18fb7c..36ffab358bdbf5d1098911fafd7dd363d4f59302 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-06-13  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gdk/linux-fb/gdkdnd-fb.c (gdk_drag_status):
+       Don't pass on GDK_ACTION_DEFAULT. The Xdnd code
+       passes zero instead, so do we.
+       
 2001-06-13  Alexander Larsson  <alla@lysator.liu.se>
 
        * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 11e94bec006a654d9fc28a5750b884b16a18fb7c..36ffab358bdbf5d1098911fafd7dd363d4f59302 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-06-13  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gdk/linux-fb/gdkdnd-fb.c (gdk_drag_status):
+       Don't pass on GDK_ACTION_DEFAULT. The Xdnd code
+       passes zero instead, so do we.
+       
 2001-06-13  Alexander Larsson  <alla@lysator.liu.se>
 
        * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 11e94bec006a654d9fc28a5750b884b16a18fb7c..36ffab358bdbf5d1098911fafd7dd363d4f59302 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-06-13  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gdk/linux-fb/gdkdnd-fb.c (gdk_drag_status):
+       Don't pass on GDK_ACTION_DEFAULT. The Xdnd code
+       passes zero instead, so do we.
+       
 2001-06-13  Alexander Larsson  <alla@lysator.liu.se>
 
        * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy):

diff --git a/gdk/linux-fb/gdkdnd-fb.c b/gdk/linux-fb/gdkdnd-fb.c
index 659716d42cbbcb784364e262f014cc89a037f420..816ae34e3f485f956f0e903a574d662ae354abaa 100644 (file)
--- a/gdk/linux-fb/gdkdnd-fb.c
+++ b/gdk/linux-fb/gdkdnd-fb.c
@@ -646,8 +646,11 @@ gdk_drag_status (GdkDragContext   *context,
 
       tmp_event.dnd.time = GDK_CURRENT_TIME; /* FIXME? */
 
+      if (action == GDK_ACTION_DEFAULT)
+       action = 0;
+      
       src_context->action = action;
-
+      
       gdk_event_put (&tmp_event);
     }
 }